Fix i386 CPU hotplug, and CPU hotplug when maxcpus= kernel boot option is used.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
index a93026083d5220fe8a074fd3ca7b7a167109d992..a5c7a5960f2d27a7506a0c1142183a2aa268ad62 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
@@ -147,7 +147,7 @@ static int __init __independent_wallclock(char *str)
 }
 __setup("independent_wallclock", __independent_wallclock);
 
-int tsc_disable __initdata = 0;
+int tsc_disable __devinitdata = 0;
 
 static void delay_tsc(unsigned long loops)
 {

diff --git a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
index 5940fe816b7e59e8b93c0dad2fed1878d38952e6..198cd836b552fa0b45eec0a7132cb71c7d880f17 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
@@ -223,8 +223,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
        cpu_sibling_map[0] = cpumask_of_cpu(0);
        cpu_core_map[0]    = cpumask_of_cpu(0);
 
-       if (max_cpus != 0)
-               xen_smp_intr_init(0);
+       xen_smp_intr_init(0);
 
        for_each_cpu_mask (cpu, cpu_possible_map) {
                if (cpu == 0)